Merge changes Ic8b33ce8,Ied6f13e5

* changes:
  installd: Avoid extra std::string copy
  dexopt: Avoid a couple std::string copies