[automerger skipped] Dist-for-goal metalava-android.jar am: 91967398ad  -s ours
am: 8d3d464cbb  -s ours

Change-Id: Iae56756be520e3ea17d5f80b42155646c824665d