Android: import new Android overlay in more places

[finagolfin]

Also, fix one test and add the right path for touch in the plugin tests.

@dschaefer2, I use this patch to build both natively on Android and cross-compile for my Android CI. It would be good to get it in before the upcoming 6.1 branch: should be easy to review as it touches nothing outside Android and makes simple changes for Android.

[finagolfin]

Ping @bnbarham, a CI run and we can get this in.

[bnbarham]

@swift-ci please test

[bnbarham]

I believe self-hosted has been having issues, but let's see 😬

[finagolfin]

Self-hosted linux passed, but self-hosted mac CI appears to be broken for the last week, maybe because of some change in the macOS CI environment for self-hosted.

[dschaefer2]

Yup, known issue with the macOS self hosted CI job. I'm waiting patiently for a fix. It's affecting all PRs at the moment.

[finagolfin]

It looks like Mishal was working on it, re-ran this one a couple times, but it was always broken.

[dschaefer2]

Yup, he assures me he's still working on it.

[finagolfin]

@MaxDesiatov, would you merge?

[finagolfin]

Ping @bnbarham, finally passed CI, ready for merge.

[dschaefer2]

Thanks!

[dschaefer2]

BTW, I'm in Ottawa Canada time.

[finagolfin]

BTW, I'm in Ottawa Canada time.

I know, I saw it on your github profile, which is why I didn't ask you 7 hours ago when I asked Max in London instead. 😄