Merge "Merge "Add logic for passing down CompactDex generation flag" am: b5fb7e91d8 am: bfe9675f6c" into pi-dev-plus-aosp
am: 0fb05dd676

Change-Id: If30717754c9cc6ff93fa1c10b07937cfa2789b88