[automerger skipped] Merge "Remove execute-only memory related code." am: 615ef33216 am: cd3df3eeeb am: 18d80b13f7 -s ours
am skip reason: skipped by user ngeoffray

Change-Id: I6e5cc30e2a5c28dc814b1aa5293abc7559a969c4