Merge "Fix lint error, and Makefile that could be confused with local files."