Reverted previous upgrade to the android platform - not compatible with CI environment.
Update CI build-tools version.