Correct some bugs on Android
Revert "Correct some bugs on Android"

This reverts commit 70d4ec0fcf16ab4b45631c4475a7a8b4fd5e5f90.