mm-video: venc: Correct a typo in variable name

A kernel variable was to be defined as unsigned long but
it is mistakenly defined as unsigned only, the space is
missing after long. This bug is silent because unsigned
is also a valid data type by itself.
Corresponding to kernel fix, similar correction is done
in userspace code.

Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf
CRs-fixed: 556771
media: Use direct project pathmap

Change-Id: I703cf1882fb1e6cffedc07ad4025d48e630f6236
media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge remote-tracking branch 'origin/cm-12.0' into lp5.0

Conflicts:
	Android.mk