(Android x86) Build fixes