am 06b9f977: Merge change 2118 into donut

Merge commit '06b9f977c36980e0e8ac4bca4fad6da0b46eac7a'

* commit '06b9f977c36980e0e8ac4bca4fad6da0b46eac7a':
  Add work-around for running DDMS on 64-bit Linux.