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

* commit '04292f146ce6148cd87f54267bec127a91fbb626':
  Support library gradle improvements