Merge pull request #5511 from paleozogt:android-64-bit
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 14 Oct 2015 11:35:04 +0000 (11:35 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 14 Oct 2015 11:35:05 +0000 (11:35 +0000)

Trivial merge