modify: or -> vs
add android dev guide
update
Merge branch 'master' of https://github.com/lixian/lixian.github.io