Merge "goldfish_setup: grant /system/bin/sh exec access am: 501c88c029 am: ce2e90308e" into nyc-mr1-dev-plus-aosp