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

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