Merge "Increment CTS Verifier Version to 2.3_r2" into gingerbread