[automerger skipped] Merge "Revert "Revert "[dexopt] Allow secondary dex files to generate app images""" into rvc-dev am: 3895bbf1 -s ours
am skip reason: Change-Id Id6e633fb95798041df75e0e3e8b926aa6038a9ac with SHA-1 b79acc02 is in history
Change-Id: I0612a84893acce48b9a41080a71bf51e75aa2b9c