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

Change-Id: I667ac3fca83f1a4d8633903d877e7fe52765b6fd