resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp

Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
tree: 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE