Merge change 26900 into eclair

* changes:
  Print IMEI/MEID in dumpsys.