jni: Avoid extra std::string copies am: 338403c900
am: ca08c68a89

Change-Id: I2eda675d583f48664381dbcebba0fe3e286833b9