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

Change-Id: I0b1ba7490adaaec8f4eaa7e4afada7425f8c1129