am 5f3c928f: Merge change Id93f4c9e into eclair

Merge commit '5f3c928f5ecdd2f41f238807c59241d34a02517e' into eclair-plus-aosp

* commit '5f3c928f5ecdd2f41f238807c59241d34a02517e':
  Turn off the last of the STOPSHIP verbose debugging