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

* commit '171504f8318b8d48c830bef3b9ff1451d76037b2':
  init: switch from android_ids to getpwnam

Change-Id: Idf79bfd2cf6436819447f12bce934329692012cd