Fix merge error to build VoicePlus, and some minor clean up

Adding this missing line to ISms.aidl fixes build errors for VoicePlus

Change-Id: If2055a8f740c9f2e9c3db9f80db5f752f040e859