Merge "Add more annotations to framework-media-annotation-srcs"