Fix building with more recent android sdk/ndks#2443

hamishmack merged 3 commits intomasterinput-output-hk/haskell.nix:masterfrom

angerman/fix-aarch64-android-9.6.6input-output-hk/haskell.nix:angerman/fix-aarch64-android-9.6.6Copy head branch name to clipboard