Merge "ART: Do not mmap boot image tables for non-executable oat files." am: 981218d156
am: 91968c1574

Change-Id: I656f9df7ae0b6b7b56a4ca500e7f4be9f7034cf6