Improvements to android build setup and samples' build scripts