Merge pull request #3 from gguowei/wp-1260

WP-1260: Android build 20131025
WP-1260: Android build 20131028