Merge "Verify that vectors of arrays within structures are properly marshaled" am: e168ebab22 am: cb38b3cd29
am: 17613613b9

Change-Id: I6c355d10d67e2a9c4e7678ebabb9914b3dd5af0c