Merge/upstream

Merges @stevenlovegrove's master. Also adds a commit to remove `include(AndroidUtils)` from CMakeLists.txt because we no longer need this sort of Android support and it slows down CMake generation considerably.