am 163be61c: Merge change 25412 into eclair

Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.