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

Change-Id: I3a09908f05e410e899e757f3710278d3a32ed2c5