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