Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp * commit '513069c39cd6610db2919c09abea2ff73158356a': Make a path constant