Merge "Add build target for jetbrains-annotations"
am: d9d8b07d72

Change-Id: I14c34e6793d1e027ca85ee4baf5fd603ca1984ee