am ae606eeb: Fix CTS host unit tests.

Merge commit 'ae606eebc7cd6785a17faf9498bf473319788aa3' into froyo

* commit 'ae606eebc7cd6785a17faf9498bf473319788aa3':
  Fix CTS host unit tests.