am 857ce94b: Merge change 26900 into eclair

Merge commit '857ce94b88d53c3deb965898098f04fbf42e55e1' into eclair-plus-aosp

* commit '857ce94b88d53c3deb965898098f04fbf42e55e1':
  Print IMEI/MEID in dumpsys.