am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE