More changes to try and get video playback and camera fixed.  Credit to Team-Hydra and sultanxda.

Change-Id: I3f9c522a289615d9a5137dc82284f3bed6978429