Merge "Change dex_location_ from const char* to std::string." am: e16a741c74 am: 958dfc8cea
am: 15b5402fea

* commit '15b5402fea258c10c02933d97416d952c739df37':
  Change dex_location_ from const char* to std::string.