Merge "Remove android.os.cts.NoExecutePermissionTest#testExecuteCode test" am: 6fde827336 am: ff32fe4c1c
am: 43ea454348

Change-Id: I44d1db0e5c197138be448b4db7731f76f4aa9370