Merge pull request #2552 from sigmabeta/android-ndk-update Android: Allow compilation using Android NDK r10e.
