Merge "Add some encoding parameters for the "record" utility" into gingerbread