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

Change-Id: I4bf431411eaa6224f8fc89b31b39d32c0fd0f9f8