Fix a few minor bugs that appeared in the latest android cmake script