Fix typo
Improve Android port