Merge branch 'stable-3.5' into stable-3.9 * stable-3.5: build: Use maven_jar from bazlets/core Change-Id: Iaef29f69d386d31586d0d763a11657a1fdf7f276