add STDCXX11 optimization

Change-Id: I85b45d8e5be32d4b639b6e5fe69968bcb5114db2