some improvements on android build
fix directory