am 230afab7: am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."

* commit '230afab744d13f6abfc4c939343821e9b4b8814c':
  Apply LOCAL_CXX_STL to also prebuilts.