Merge commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7' into eclair-plus-aosp * commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7': Use the media.enable1026 system property to indicate whether the