SDK Tools rev 22 has moved built tools around.

Support the new locations.
Add most recent version of apkbuilder scripts.

This is no longer included in SDK tools rev 22.
Update apkbuilder scripts to get sdk_dir from env.

This allows calling them from inside our package directory, and
run within the configured SDK directory.

The windows .bat file version is untested.
Support apkbuilder on SDK tools rev 22.

Means shipping the script ourselves.
Correct version number.
Whitespace fixes.