Android 2.3.6 release 1
Merge "Mute unharmful build warning at the top of the build log:" into gingerbread