Merge "Convert jsr305 to Android.bp" am: 51edc4fd26
am: 92cedd29e0

Change-Id: Ic2412268fe480ddd86af23ef0597366071184e03