am d71ab51a: Merge change I3e1bdd38 into eclair-mr2

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

* commit 'd71ab51a46d3648493ab3425e77e5762544be03a':
  Transcode files again.