Merge "Add aurimas as the owners of the android.annotation package" am: b65218c561 am: 001cf41de5

Change-Id: I20477b10ec559585e876388738539096992586d0