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

Change-Id: Id5c89b418eb476cb2360e710a1d6244a3c4334ba