prima: Update to 3.2.2.1_rb1 release

Change-Id: Ide3f5931d6e086ef5023577583eba6f205f92868
prima: Reapply fixes after upgrade to 3.2.2.2

Change-Id: I9315c6a67312d4d43f92146262970b23d49b4824
Merge branch 'cm-11.0' into kk_mkt