Merge \"goldfish_setup: grant /system/bin/sh exec access\"
am: 7a866d783c

Change-Id: I340d78d01171de2eda4f25a2b4dbe0d637f35d59