Update templates to match newer, mostly-NDK Android port