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

* commit '958dfc8cea8bb8babe94d385a4f36fda6f69a632':
  Change dex_location_ from const char* to std::string.