1. Replace STLDeleter with unique_ptr in container, which is supported in C++11 2. Replace string_as_array with &string[0] which is guaranteed to work in C++11 Change-Id: I7f39c0e51fc8a3fcbb41313094a0ca6b33db7bf3