common styles for master & ics builds
merge order
Merge branch 'master' into android-1.5