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

Change-Id: I41e110dee813021552fee125ddbcbdbaba2d6703