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

Change-Id: I892d846a1742b965cad5be07a2e6f94eb3e1463b