[[ Merge 6.5.3 ]] Added new class to allow one to use tools/build-android-debug.sh - which has been updated