am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"

* commit 'b3be89dfe9e0eb1cb0fbf834d6fbcef976c03a1e':
  android_filesystem_config.h: change ping and run-as