Merge "[dexopt] Allow secondary dex files to generate app images" am: 6c7d069509 am: 7b9d08a483

Change-Id: I32a8614d9f6c1e0657a9cb3a1b616b2c91e16c7a