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

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