upgrade to more current android build system