am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread

Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp

* commit '98f310879790a98c4c24cd06677e08bf49f1cea0':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
tree: 75d47cdcbb7eadf0f96aa8203158ca157cc4a260
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE