Merge "Support library gradle improvements" into mnc-ub-dev