Merge "Revert "[dexopt] Allow secondary dex files to generate app images""