Merge "Enable secondary dex compilation in the background dexopt job" am: 34200a1ad1
am: a5ab384e1c

Change-Id: I68d3c5ae807d0a61a80ceddc7add2f0cdcfb1cc8