Merge "Revert "android_ids: move to bionic""