Merge "Add androidx.annotation_annotation library"