Android N Preview 4 (NPD56N)
Merge "goldfish_setup: grant /system/bin/sh exec access"