am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb

* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.