Merge changes from topic 'libcutils_private_headers' into oc-mr1-dev

* changes:
  Use getpwnam()/getgrnam() instead of AID_* macros (dumpstate)
  Use getpwnam()/getgrnam() instead of AID_* macros (libgui)