Backport to GLES 2, start moving all file IO to resource_locator
Android.mk tweaks