Merge "Fix lint to run under java 9."