[automerger skipped] Pass compiled metalava stub classes through metalava again am: 41e49c33 -s ours am: bf540d3c -s ours Change-Id: Id9c5d37d2ed3102def93d545b80e5ea9812cbc92