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.