Merge "Fix cts h264 test error" into nyc-dev
am: 88cd7d22d5

* commit '88cd7d22d5c48ebd61d760bebdf5a2e20b0948b5':
  Fix cts h264 test error

Change-Id: I95b979564aabb82f8fae5786885cbf1938b96dd9