am fea7a4d4: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp

* commit 'fea7a4d44cda8a9bb9bbf7ec53760a985e114f64':