Update Android.mk with new locations of source files
Merge branch 'tile-management' of https://github.com/tangram-map/tangram-es into tile-management