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

Change-Id: I71efe4a921fe3a03f90b90870b400d242acf5eb1