am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb

* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
tree: 9232fad7dac365eeaad84efbbdd973cb0f0b851a
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/