am 1e22cffa: am 63851404: Merge change Ibf0c320a into eclair

Merge commit '1e22cffa1d7299e725ec2a16689901aaa5790922' into eclair-mr2-plus-aosp

* commit '1e22cffa1d7299e725ec2a16689901aaa5790922':
  When using MDP, we needed to use a texture for diming.