Revert "prima: Reapply fixes after upgrade to 3.2.2.2"

This reverts commit f85e35bb8a71a9e7b4d9951784988177381a7863.

Revert "prima: Update to 3.2.2.1_rb1 release"

This reverts commit 5267fdd62c72ebe34d0a360b4efa591fda6ff66d.

The new version has issues with P2P GO negotiation and sessions,
so back off for now

Change-Id: I6469664832643f813e061f5b7f5d20d4dc1a0dd4
Merge remote-tracking branch 'cm/cm-11.0' into HEAD