Merge "Vdex: Workaround arrays with erroneous component type." am: de9e54abcf am: a629563348 am: f9e1109b2d
am: 394c20c773

Change-Id: I3d0d9eb342d937a24a36088c8b15429a0efff297