Android 2.1 release 2.1s
Merge change 24481 into eclair

* changes:
  Convert emma license info file into text format