Fix names
Merge branch 'android-4.3' of https://github.com/Schischu/android into android-4.3