Merge "Revert "[dexopt] Allow secondary dex files to generate app images"" am: 799cfc57c3

Change-Id: I35f2614af2566f2a9bbbe62058f74ef73aa46f60