Merge "Revert "Revert "android_ids: move to bionic"""