FIXUP: Fix Android build 1