Merge "Update CTS to 2.3_r9" into gingerbread