Merge changes Ide36f188,I86bb8e0a into ndk-release-r21

* changes:
  Revert "Move __ANDROID_NDK__ to <android/ndk-version.h>."
  Revert "Only create zip archives of the NDK."