Android 2.3 CTS release 12
Merge "Mute unharmful build warning at the top of the build log:" into gingerbread