am d6e54a90: am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit 'd6e54a902368885072975dd0bad78dcd1cafaaea' into eclair-mr2-plus-aosp

* commit 'd6e54a902368885072975dd0bad78dcd1cafaaea':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.