Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp * commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b': Rename several files so that readers would not be confused.
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp * commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b': Rename several files so that readers would not be confused.