Merge changes I55f26e97,Iec044d31

* changes:
  android-emu: Fix -Wunused-function warning
  android-emu: Fix -Wunused-parameter warnings