Merge "Load /data oat/odex files non-executable when only_use_system_oat_files is set."
am: 2b1a21ed35

Change-Id: I92c22b83a2690c08672dad2fad7cfe1637f0c4e7