Merge "goldfish_setup: grant /system/bin/sh exec access"