Merge "Make unicode-width available to product and vendor am: 3233e4da66 am: 76ff8ba1b4 am: c6c1458a2a am: ebb167519e am: 473681c843"