am cd5494ba: clean up some assorted messes

Merge commit 'cd5494ba06fc709c15dea1f73f7673c4fd5b953c' into gingerbread-plus-aosp

* commit 'cd5494ba06fc709c15dea1f73f7673c4fd5b953c':
  clean up some assorted messes