resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

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