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: I2c2f0986e7722d0ec52dc59d1eb12013a06a76b3
Merge "Revert "Unbundle libstlport with NDK r4.""
am 881d508e: Merge "Revert "Unbundle libstlport with NDK r4.""

* commit '881d508e7f9762cba51ac5f4c8bd99e44affa5dc':
  Revert "Unbundle libstlport with NDK r4."
Use __ANDROID__ to test for Android platform

See da9f426bc09bb60333b4f00d94f19e824a02ca94

Change-Id: I44682ff93e59ca70f0f40d0b994db6e006d59e39
Remove static initializers

See the following
  081e33a126ab37b38254319b38ecd33f8fc4ec56
  570e4c3795240d98ae86aeb716f5f5257a64aabd
  d90ba8a58b76bef9d2fb5323ec0e251de0e38af3
  032704671f009c586ff8b75e34d5027ceab3d510
  2590f1e2174e97558461669792b565903a8398ca (revert 1 of the above)
  fe6a94f3693e27c3f509329aeece355c800a7e7f

Change-Id: I9aaedd3c55106b5890546e55bfa012bfa9d432f2
Remove wchar_t-related compiler warnings when building the STLport sources

See 61e547de892f7dda62cc76c582326f307922b0d0

Change-Id: I10494b789e72d414797f8bf8bdaff720b8c3d22f
Fix _STLP_USE_EXCEPTIONS

See 814dc3187578d2aa718d9d218707239ec6ddf18e
013fff3524b2798e9d45aefcc13236021da234db
ac2a8a648f99d118c8b8183a6cebefd3c596d197

Change-Id: I47fc735a7a621c1c3cde85f488f7f71532f8d4d0
Fix compilation with clang and GCC 4.7

See 34ed92a1b33fc95e1bf48a7f1840ddbcbacb5e3e and
7414fafb3c392b0fee2932afd175a4ed0950aae9

Change-Id: I7c4e1ffda33ff9be134df1f2e4c8b4e627526936
Fix a STLport-related crash.

See 37b00fcfc3a53bdef5fe7c9c3dba0fd0f26ad298

Change-Id: I0744d8a7508bc4760d277ac55707e67126de1581
misc fix

Change-Id: Ie92da139766cf27ac23ffd2f0ee7a86a0d0a2329
Merge "Use __ANDROID__ to test for Android platform"
Merge "Remove static initializers"
Merge "Remove wchar_t-related compiler warnings when building the STLport sources"
Merge "Fix compilation with clang and GCC 4.7"
Merge "Fix a STLport-related crash."
Merge "misc fix"
Merge "Fix _STLP_USE_EXCEPTIONS"
Merge remote-tracking branch 'aosp/master' into HEAD