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

Change-Id: I48e139fec5b1fae93a8e3976a0070e143dd117e4