Cm 10.2 video changes from the m7 kernel

The first few commits I pulled from older M7 commits because they helped resolve some horrendous merge conflicts.  The rest are all a series of commits that got pushed yesterday to the M7 as part of the CM 10.2 work.