Merge "Add logic for passing down CompactDex generation flag"