Android 4.2.1 release 1.1
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
3 files changed