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

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