Merge "DO NOT MERGE. Make doclava use fullsdk android.jar." into nyc-support-25.1-dev