Android: Bugs fixed
Android
merge wenwen