am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.

Merge commit '135677a71800c27d7747b5c86712d05a74392f62' into froyo-plus-aosp

* commit '135677a71800c27d7747b5c86712d05a74392f62':
  For userdebug builds, enable Dalvik lock contention sampling.