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