am 30865cb9: Revert "Unbundle libstlport with NDK r4."

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