Merge "Make autorelease & unimgr use java-builder-4c-16g"