Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set"
am: 65ba0bf59c

Change-Id: I56882452ae7e794d2cbee8f3e4c04fc1d11e1fe1