Update android build scripts for APSE upgrade