rebase on latest code, refine android build