Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp * commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf': revert the stripping of System Group:
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp * commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf': revert the stripping of System Group: