Update to support new android build-tools dir