Merge "Update OWNERS for keymaster Java code"