Merge "Update Support library gradle build files WIP" into lmp-mr1-ub-dev