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

Change-Id: I858c898d058db9d835557a19b163f94a366ea7fa