Account and Folder are both json objects now.

We dont have a seperate parcelable account and serialized account
string (for pending and regular intents)

Fixes b/6805342 Email crash on opening message from notification bar

Change-Id: I5b310fbafefb8dd82b9e222421fb624703b1676b
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
Import translations. DO NOT MERGE

Change-Id: I11befbb19117e56d80f5de0adecf291eee28422e
Auto-generated-cl: translation import
am f986f44e: Reduced the number of calls that did the same thing in the Folder class.

* commit 'f986f44ecac2b65fa50dcd8543945ff85d3b2245':
  Reduced the number of calls that did the same thing in the Folder class.
Merge "Import translations. DO NOT MERGE"
am 3a0c7296: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit '3a0c72969c1c2444eca22c85a05072d529940c78':
  Import translations. DO NOT MERGE
Reconcile with jb-mr1-release

Change-Id: I48428e48aa754bdfa6d8248472bd69607789c509
am 465fddea: (-s ours) Import translations. DO NOT MERGE

* commit '465fddea9ed7c2eeea75e9e33b1f8944bf70e1a4':
  Import translations. DO NOT MERGE
am 08340425: (-s ours) Reconcile with jb-mr1-release

* commit '08340425b240879b1358732994417b2851cb1087':
resolve conflicts w/fb3ec1a8

Change-Id: Ia2bd70734c3dbcf973c897f58db4b9cb565f9141
am ccbaa718: resolve conflicts w/fb3ec1a8

* commit 'ccbaa718552b6f05010b1959275d78b95d1a82ed':
Recover changes from jb-mr1-dev

Change-Id: I4200a246cf170125fdb285aaa45d17bea1de5bca
am 7f5a870d: Recover changes from jb-mr1-dev

* commit '7f5a870d4f86a32860e50030be08bd44e840ec93':
  Recover changes from jb-mr1-dev
am dbcab3ca: am 949fc3d8: Prevent NPE when the message has been deleted

* commit 'dbcab3ca23e4f6f482d74ac962958a4fffc999ee':
  Prevent NPE when the message has been deleted
am 28b1d75f: am dbcab3ca: am 949fc3d8: Prevent NPE when the message has been deleted

* commit '28b1d75f73b5b8ce07e41a0d55513fee9b4e3558':
  Prevent NPE when the message has been deleted