Update templates to match newer, mostly-NDK Android port

Should be able to enable template test builds in CI now!