android_ids: move to bionic am: bc56847e84 am: d0abdb75a1
am: 22f13c4b11

Change-Id: I5d6e71177ea4092b435442dd1d93f38b3ec39221