bring the boom
prima/LNX.LA.3.5.2.2.1_rb1

Change-Id: I85f619ef8d4c9b238f951f4439a9dd12259614f1

Conflicts:
	drivers/staging/prima/Android.mk
	drivers/staging/prima/Kbuild