Merge "Revert "Revert "[dexopt] Allow secondary dex files to generate app images""" am: 0b9c8e168f am: 44dcbfcfac

Change-Id: Id22eb637506a748d4c8dca16010602efe860e082