Merge change I92cdc5ed into eclair

* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
tree: 00ef3c2759e54fabd9d166561ca03ffbcefd6c1d
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE