Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"