android: build system fixes