改进android的makefile
Merge branch 'master' into refs/top-bases/t/3rdTools/gtest
Merge commit 'refs/top-bases/t/3rdTools/gtest' into t/3rdTools/gtest
merge
merge
Merge branch 'master' into refs/top-bases/t/3rdTools/iconv
Merge branch 'master' into refs/top-bases/t/3rdTools/libxml2
Merge branch 'master' into refs/top-bases/t/3rdTools/zlib
Merge commit 'refs/top-bases/t/3rdTools/iconv' into t/3rdTools/iconv
Merge commit 'refs/top-bases/t/3rdTools/zlib' into t/3rdTools/zlib
Merge branch 't/3rdTools/iconv' into refs/top-bases/t/3rdTools/libxml2
Merge branch 't/3rdTools/zlib' into refs/top-bases/t/3rdTools/libxml2
Merge commit 'refs/top-bases/t/3rdTools/libxml2' into t/3rdTools/libxml2
Merge branch 't/3rdTools/libxml2' into refs/top-bases/t/support/game
Merge branch 'master' into refs/top-bases/t/3rdTools/yajl
Merge commit 'refs/top-bases/t/3rdTools/yajl' into t/3rdTools/yajl
Merge branch 'master' into refs/top-bases/t/3rdTools/yaml
Merge branch 't/3rdTools/yajl' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/3rdTools/yaml' into t/3rdTools/yaml
Merge branch 't/3rdTools/yaml' into refs/top-bases/t/support/game