Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs"