am e5f45d37: am 881d508e: Merge "Revert "Unbundle libstlport with NDK r4.""

* commit 'e5f45d3719275b0fd752b94c3de2e6ca8bb097bb':
  Revert "Unbundle libstlport with NDK r4."