am 8bbe558c: Merge "Remove hardcoded references to /sdcard from cts." into eclair

Merge commit '8bbe558c4fbff327dcb91acd42f4c927079c7359' into eclair-plus-aosp

* commit '8bbe558c4fbff327dcb91acd42f4c927079c7359':
  Remove hardcoded references to /sdcard from cts.