Update template. Hotswapper confirmed working.
Update AOSPA repo for kitkat; use "revision" for local_manifests