Support android-8: closes #1601