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

Change-Id: Ibbc56b0d7444ed8c7656cda97ce5cf20b4b89dc0