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

Change-Id: Idde6fac45488a91d867bbeadd036eba82ee3d647