Merge "Support library gradle improvements" into mnc-ub-dev am: 04292f146c
am: f09f1e1a1c

* commit 'f09f1e1a1c932d2d0ed446dc7167c016a2d2df93':
  Support library gradle improvements