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

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