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

Change-Id: I718ecb5674a2ce85de4116ece310af404614e45c