Merge "For metalava target, use droidstubs instead of droiddoc"
am: 5eb84c0065

Change-Id: Iae290fe3c3e6eaf4fda9675bd92e73da87ebd668