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

Change-Id: I94771fe7b2726a1dd0cf53b10e0446abaeaa948c