android build: fixed out of tree builds part 2