[automerger skipped] Merge "Add metalava-api-stubs targets" into pi-dev am: a08d1ffbb7  -s ours
am: 4d9c94d541  -s ours

Change-Id: I78abaa5f7256d6837efcb5f6c00bf9aa7efa449a