Reformatting for consistency
Merge branch 'lifecycle' of https://github.com/tangram-map/tangram-es into lifecycle

Conflicts:
	android/src/com/mapzen/tangram/Tangram.java