Fix -Winconsistent-missing-override warnings on Android
Changes were also made for codestyle compliance.