FIXUP Android build 1