Merge "Add logic for passing down CompactDex generation flag"
am: b5fb7e91d8

Change-Id: Ia2f2e6b97c19a20c57a98c4191df0e631b342ae6