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