am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f

* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
tree: 29672e361f7c6f3e6cc4db311b837f040101a649
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE