Merge "Support stl variants when LOCAL_NDK_VERSION is set." into honeycomb-mr1