android build is OK now