[automerger skipped] Add metalava-api-stubs targets am: bd9eda5094  -s ours
am: 99757e98c6  -s ours

Change-Id: Ie5507dd6a3c0ab4b22edb392ec713cf13addb66a