Merge "MediaPlayer2: unhide prepare DRM error codes"