Merge "Build jsr305 with core_current"
am: e51e6c827e

Change-Id: Idcefc1d8688a8887a7066251d97f9a847943caca