Merge "init: switch from android_ids to getpwnam" am: 171504f am: 43cbd05
am: ff37c38

* commit 'ff37c38bac299914712852e92d88c74d9b78aa27':
  init: switch from android_ids to getpwnam

Change-Id: Ie976999e308ec7625a02cb2b5c0ab1fd21645669