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

Change-Id: Icf5c0e0ee0b55a83b400ee2491ae1f7d8d8ce529