am 0e2dc026: am cc356db5: am 5ee74388: Merge "Disallow using stlport."
am 0e2dc026: am cc356db5: am 5ee74388: Merge "Disallow using stlport."

* commit '0e2dc0261f3f56bc7b6253468c2c1a338c7b87ef':
  Disallow using stlport.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build