Merge "Revert "Revert "Clean up build.gradle files in support library."""