Merge "Enable multi-dex for incremental settings builds"