Merge pull request #3384 from akallabeth/android64_build