Rebase for android build