Merge "Merge "Fix EncodeDecodeTest checkFrame" into lollipop-mr1-cts-dev am: 2fa32a8ef1" into marshmallow-cts-dev
am: cf489fc669

* commit 'cf489fc6693927e82d7d0931160ea856bb05c7e1':
  Fix EncodeDecodeTest checkFrame

Change-Id: I4e2596ef662a06f624bde732d6fca5d1791c1bc9