[squash] attempt to fix Android build