Revert "Merge branch 'jb_3.2.1' of git://codeaurora.org/platform/packages/apps/Exchange into caf"

This reverts commit 4878146db687b8836e9fc0c22d782463f04b2e02, reversing
changes made to 0a3970a801b74aa563d461ea43989f16c2723bd9.