Merge "android_filesystem_config.h: Add Brillo users."
am: 8688dba547

* commit '8688dba54791cdab323f715a036a952a617945f2':
  android_filesystem_config.h: Add Brillo users.