Merge pull request #7526 from alalek:fix_arm_builds
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Nov 2016 10:49:43 +0000 (10:49 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Nov 2016 10:49:43 +0000 (10:49 +0000)

Trivial merge