Merge changes from Android/CMake upstream repo to support NDK r10d.
Safeguard against the editor's user resource directory containing outdated Urho editor UI layouts, which can lead to exceptions in the editor. Note: some UI resources like fonts and textures may still be overridden by the user resource directory.
Merge remote-tracking branch 'upstream/master'