Merge "Update owners of framework-jarjar-rules.txt"