Merge "Fix computation of primitive array widths." into dalvik-dev