resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp

Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
tree: 0e1a9d2e630818a485a555fad06a5e6bd3989dcd
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE