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

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