Merge "ART: Remove multidex limit" into mnc-dev