Merge "Remove execute-only memory related code." am: 615ef33216

Change-Id: I7cb27a466c9260f2243e24ac57c4d3b31e7acf80