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

Change-Id: I7d1021243fe0f45cb9428976bee077cc85925ccc