am d4e03f37: addresses parts of 3096779 and 3097475

Merge commit 'd4e03f37423bee383d17f7292753a5f67e497a28' into gingerbread-plus-aosp

* commit 'd4e03f37423bee383d17f7292753a5f67e497a28':
  addresses parts of 3096779 and 3097475
tree: 2bbc990d9d7f15bacb80acb10ee4838af71bd356
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE