Merge \\\"goldfish_setup: grant /system/bin/sh exec access\\\" am: 7a866d783c am: 0db549d72c
am: 53896ca942

Change-Id: Ia0f2715a13126c1d93cbbe93b50179e231c39013