Merge "Build jsr305 with core_current"