am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
tree: 5665b392bebc595ee76fd64f6469614b51588efb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE