Merge "Set LOCAL_CXX_STL := none for cts-usb-accessory" into mnc-dev