am f854e077: (-s ours) Merge change I8134d6ed into eclair

Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.