Merge "Fixes Treble marshaling of strings embedded in structures from Java"

am: 97fca8c035

Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e

core/jni/android_os_HwBlob.cpp

@@ -382,7 +382,7 @@ static void JHwBlob_native_putString(
     s = nullptr;
 
     hidl_string tmp;
-    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size);
+    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size - 1);
 
     sp<JHwBlob> blob = JHwBlob::GetNativeContext(env, thiz);
     blob->write(offset, &tmp, sizeof(tmp));