Merge "For metalava target, use droidstubs instead of droiddoc"