Update to use a new java-base branch