Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c0 am: 0bae9b14 am: 0e686542 Change-Id: I145b206fc2af5dee4271b94640476507a49f7dbd