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

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