am 32d65628: Merge "Update CTS to 2.3_r9" into gingerbread

* commit '32d65628f658fc0a6b7604ce1ec0d02397903339':
  Update CTS to 2.3_r9