fix PVR building

Change-Id: Iebb1c78b03994d2aebe1ff6cdd7842afb2e0e904
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1