FIXUP: Fix Android build 2