Some cleanup.

Change-Id: I47d867f3eaed55b53fdc26b463eef29994ecfd22
Merge branch 'jb2' of github.com:aways/android_packages_apps_Mms into jb2