Merge "android-x86: use proper variable typing"