Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0