Merge "Merge "Add logic for passing down CompactDex generation flag" am: b5fb7e91 am: bfe9675f" into pi-dev-plus-aosp