am 1943f2b1: am 0ec050af: am f581c1ea: Unbundle libstlport with NDK r4.

Merge commit '1943f2b18719c3e797c20a4033929245c93b73f6'

* commit '1943f2b18719c3e797c20a4033929245c93b73f6':
  Unbundle libstlport with NDK r4.