Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035
am: 0bae9b1406

Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf