am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1

* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE