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

* commit '00e15cd5554c25ba006b355945db1cc1f00fc3c7':
  Revert "Include new AOSP messaging app in base builds."