am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in...
am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '09baf014':
Revert "Include new AOSP messaging app in base builds."