Move C++11 shim from contrib/ to autowiring/