Make somes changes due to new android-build commands