am d47bb38e: (-s ours) am 32d65628: Merge "Update CTS to 2.3_r9" into gingerbread

* commit 'd47bb38e772655677b910c3870c7bb9a13966ed0':
  Update CTS to 2.3_r9