Remove Map::cleanup and Painter::cleanup

Both were noops.
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/map/map.cpp
Fix missing shader cache path