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

Change-Id: Ifdec5c6bb5f39c62939d20f6b535b296c909aee1