am da78534e: Merge change Ia94518e3 into eclair

Merge commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-plus-aosp

* commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c':
  ADT test fixes.