Merge remote-tracking branch 'mjb/android-build-update'
authorKeith Packard <keithp@keithp.com>
Wed, 18 Sep 2019 23:26:44 +0000 (16:26 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 18 Sep 2019 23:26:44 +0000 (16:26 -0700)

Trivial merge