[automerger skipped] Pass compiled metalava stub classes through metalava again am: 41e49c3381  -s ours
am: bf540d3cb3  -s ours

Change-Id: Id9c5d37d2ed3102def93d545b80e5ea9812cbc92