switch from android_ids to getpwuid am: 5f62b50
am: bdc327b

* commit 'bdc327bd33e9778e1e888f82f8b9bfebae1f5c30':
  switch from android_ids to getpwuid

Change-Id: I55c20c1db171678098743054ad7a72ab43141657