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

* commit '58d68daf09e52b0d603b0c41f0bd95fcfd0c454c':

Change-Id: I19aa317f24fff288e66ad1c8884e03a5c196e257