Merge "Suppress warnings of MultiDexLegacyAndException" into nyc-dev