Merge change 23409 into donut

* changes:
  Avoid a buffer overrun in GET_NORMALIZED_STRING.
tree: c3e3816a392696eea1713ab9ab826b18306a16b5
  1. android/
  2. dist/