am 7b935e84: Merge change Iead0d4d8 into eclair-mr2

Merge commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef' into eclair-mr2-plus-aosp

* commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef':
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.