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

Change-Id: I1399542f44017ea278241d81d5f8a769a20dcf9a