Merge commit '4d3a9728c27ff8959b8da93325b52e8ff7b67b12' into eclair-plus-aosp * commit '4d3a9728c27ff8959b8da93325b52e8ff7b67b12': Rename ro.monkey to monkey.running