Merge "Add tools metadata annotations to the appcompat library" into klp-ub-dev