am 3de4dcdb: Merge "android-x86: use proper variable typing"

* commit '3de4dcdb189262e5beb73fe8431df67d51ec9f5f':
  android-x86: use proper variable typing