[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev am: cb3dd2889c  -s ours
am: 8ffbeb1877  -s ours

Change-Id: I3f3b422b208acb8b405647d3438b1f2af20a56e1