Merge "Build jsr305 with core_current" am: e51e6c827e am: 656907bf10
am: 6480bab9fd

Change-Id: Ifc9f9b06fd650675e65f44c4519afdf509af7360