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