am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img