Support for AOSP 4.4 placement of Mms in system/priv-app/Mms.apk

This is not pretty, but it is the most direct. This is still a bit of a jumble from the 3.1 branch.
Update Slim reservoir; fix accidental 4.3 breakage

Left a testing change in there. whoops.