am 0c804176: Merge "Add local video tests." into gingerbread

* commit '0c804176bad4a4a25e7d885abb76ddda67ffe4f0':
  Add local video tests.