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

Change-Id: Ide0f8c117fc1f7406966bea73e88009eca21bc3d