Merge pull request #4612 from kumpera/android-changes-part2
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Wed, 5 Apr 2017 23:59:08 +0000 (16:59 -0700)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 23:59:08 +0000 (16:59 -0700)
Fix Android compilation and some tests


No differences found