Merge "Properly set LOCAL_CXX_STL where needed"