am f25c9660: (-s ours) am 1e23a401: am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair

Merge commit 'f25c96609224213be07a34219a32c006ee9063f0'

* commit 'f25c96609224213be07a34219a32c006ee9063f0':
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.