merge pull request and fix some conflicts
Merge pull request #2187 from minggo/merge-fape-android-eclipse

merge pull request and fix some conflicts