typo
Lint fixes

Conflicts:
	app/src/main/java/com/mapzen/data/osm/OsmNode.java