Merge pull request #13967 from alalek:backport_android_build_py
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 5 Mar 2019 12:46:08 +0000 (12:46 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 5 Mar 2019 12:46:08 +0000 (12:46 +0000)

Trivial merge