Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c am: 5f57659030 am: 15f24e5df9
am: 86e63c8ae6

Change-Id: I0c9347c53425c7e1fc895a921933c18067e46b56