Use linux android build
Fix merge conflict in travis settings