am 3fd5fa4c: Fix the runtime restart due to name change.

Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
  Fix the runtime restart due to name change.
tree: 14932a87458bbc9f1488a977ea1a1a31539b22af
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE