Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread