Merge "Revert "android_ids: move to bionic"" am: b0a15d8319 am: 88aa74b86f am: fee5e1cdd7
am: 2cec27ee5d

Change-Id: I37010b6662af8dcf2f72a327ba55d3896fe37a1c