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

Change-Id: Ifc69bdc6668e173517206b75f9d1f0f7f28d8095