Merge changes from topic 'libcutils_private_headers'

* changes:
  Use getpwnam()/getgrnam() instead of AID_* macros (libgui)
  Use cutils/android_filesystem_config.h