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

Merge commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c' into gingerbread-plus-aosp

* commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c':
  Unbundle libstlport with NDK r4.