Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246d Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I2617893f2fe4056e5b41399bf636d24e0d7dc8a1