Merge "Add clean headers for 7x30 video codec." into gingerbread