Adopt the new prebuilts/ndk/<number> paths.

Bug: 6932421
Change-Id: I42b62b521222991b372610b26a54ebf6c34bf714
Revert "Unbundle libstlport with NDK r4."

This reverts commit f581c1eaf398e25de8ecae69c46c698604b288f0.
Now unbundled native code should instead use:
LOCAL_NDK_STL_VARIANT := stlport_static
which is the NDK prebuilt version of stlport.

Change-Id: Ib890a8580dedb1f5e89d2889859cc0f0854340d4
Bug: 6932421
am 4c86b6ec: (-s ours) Adopt the new prebuilts/ndk/<number> paths.

* commit '4c86b6ec1a905e46f2a575ac0851ec5f153a4acf':
  Adopt the new prebuilts/ndk/<number> paths.
am 30865cb9: Revert "Unbundle libstlport with NDK r4."

* commit '30865cb901602ed078ff2ed534529d847b3b54b5':
  Revert "Unbundle libstlport with NDK r4."
am e5f45d37: am 881d508e: Merge "Revert "Unbundle libstlport with NDK r4.""

* commit 'e5f45d3719275b0fd752b94c3de2e6ca8bb097bb':
  Revert "Unbundle libstlport with NDK r4."
am 1a65be97: Merge "Use __ANDROID__ to test for Android platform"

* commit '1a65be974ca1b908969c798923d3a19e7c8ce801':
  Use __ANDROID__ to test for Android platform
am f6943b71: Merge "Remove static initializers"

* commit 'f6943b71aea7ae639e41e47feaf5d2d505bee811':
  Remove static initializers
am 7d4b717b: Merge "Remove wchar_t-related compiler warnings when building the STLport sources"

* commit '7d4b717b3b48998a13070b383a98c972aec00781':
  Remove wchar_t-related compiler warnings when building the STLport sources
am e6eb0085: Merge "Fix compilation with clang and GCC 4.7"

* commit 'e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1':
  Fix compilation with clang and GCC 4.7
am a425ebce: Merge "Fix a STLport-related crash."

* commit 'a425ebceb7d24785e46f77e8e5464e7e50f45cca':
  Fix a STLport-related crash.
am 8cfe752a: Merge "misc fix"

* commit '8cfe752a64222225f3199da5feff6664628590c9':
  misc fix
am f18429e3: Merge "Fix _STLP_USE_EXCEPTIONS"

* commit 'f18429e3d6bf0d955f66160644de0672f045872a':
  Fix _STLP_USE_EXCEPTIONS
Revert "Fix _STLP_USE_EXCEPTIONS"

This reverts commit 91b1d7f8d7847f7b032a8a289b2bb5911c731fba.

o related-to-bug: 7966335

Change-Id: I2c091bf1093aa0f568d6aee5926ced404a90f1ab
Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/external/stlport into sm-jb-mr2

Android 4.3 release 2.1