Fix previously committed merges.

Seems CM changed some of the patches we already had committed

Change-Id: Ibe7b8735a1328eec4d540f5ee32cff82562d1bec
Policy Hal:  Fix video stutters.

  NULL cannot be used as a third arg for property_get.
  This was causing the offload properties to be ignored
  forcing offload during streaming video.
   Thank you Arcee

Change-Id: I34cb6ffb60a11ad0eb346c99ce7ec96f323c54ae