Merge "Add local video tests." into gingerbread