Merge pull request #8653 from alalek:android_fixes
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 3 May 2017 12:20:19 +0000 (12:20 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 3 May 2017 12:20:19 +0000 (12:20 +0000)

Trivial merge