Disable failed UT and Fix  Build Error onAndroid
Merge pull request #1253 from dongzha/FixBugandBuildErroronAndroid

Disable failed UT and Fix  Build Error onAndroid