am dd848041: Merge change 24481 into eclair

Merge commit 'dd848041237b660bad38e6567cbfc0c0c5161c24' into eclair-plus-aosp

* commit 'dd848041237b660bad38e6567cbfc0c0c5161c24':
  Convert emma license info file into text format