Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev