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

Change-Id: I3a008f4324767fc8d31d24ac7730774afffd549d