Merge "Include annotations in metalava stubs" into pi-dev