am e0998604: Add necessary logic removed during backport

Merge commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp

* commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
  Add necessary logic removed during backport
tree: 28de80333907879eb5e3aa31e9eafff1e8f08fbb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE