am 50d0511d: Reconcile with ics-factoryrom-2-release

* commit '50d0511ddbf226255347e95a6382af8b0e7d366b':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
tree: 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE