Merge "Update gradlew to relocate .gradle into out/..." into klp-ub-dev