Merge commit '9b9a89a5' into froyo-plus-aosp * commit '9b9a89a5': added a cleanspec since ActiveSyncInfo.aidl was removed