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

Change-Id: I22b5071dd8d0ce0573aba6a6b4d9b28b4e8509af