Merge pull request #12323 from alalek:android_ndk17_support
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Aug 2018 12:09:13 +0000 (12:09 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Aug 2018 12:09:13 +0000 (12:09 +0000)

Trivial merge