Merge "Add new dexopt flag to control CompactDex generation"
am: 64d9442a11

Change-Id: I89d080294131f40d62928abf1755a2470ef25c1d