am 025a39af: SIP: misc fixes

Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
tree: 28de80333907879eb5e3aa31e9eafff1e8f08fbb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE