Android 4.0.4 release 1.2
Merge "improve h/w composer documentation" into ics-mr1