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