am 03eaa114: Merge "Allow both AOSP and Google account types for Exchange" into jb-mr1-dev

* commit '03eaa114b992767a6a7bf4c0be88d1360f85db88':
  Allow both AOSP and Google account types for Exchange