Fix error message to match CTS

Bug: 8657725
Change-Id: Ib608eb55f14d557d667f93e4f646c03d5ea470c1
Merge "Camera: Add preview callback surface support"
Use correct pid when running under test harness

This is a partial fix which addresses one of the root causes of this bug,
but only when running under test harness.  It has no effect otherwise.

Bug: 8598539
Change-Id: I87444daef1d76b17544f331e651ba1c87893c381
OMXNodeInstance: actually fix OMX_GetExtIndex logging

Bug: 8538872
Change-Id: I228746e8eb502af4bba4054caa4d8569fab35025
am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging

* commit '5ffabf0664b80b3dd94d40a3a63db25ecd993fd0':
  OMXNodeInstance: actually fix OMX_GetExtIndex logging
am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging

* commit '5ffabf0664b80b3dd94d40a3a63db25ecd993fd0':
  OMXNodeInstance: actually fix OMX_GetExtIndex logging
am 2ffc2b8e: am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging

* commit '2ffc2b8e5e4b6ed54bc2924a1f146b0a04f79670':
  OMXNodeInstance: actually fix OMX_GetExtIndex logging
Merge "Fix sample info parsing" into jb-mr2-dev
am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'da77cee96d33aa015f90e537ce2d06e6853aac93':
  Fix sample info parsing
am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'da77cee96d33aa015f90e537ce2d06e6853aac93':
  Fix sample info parsing
am c2e8f144: am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'c2e8f144db456b1612ea95893b17ddc3cdb2e844':
  Fix sample info parsing
Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

* commit '2c157e0f127f36b4c709508f899c2a9f32ba3bd4':
  Make sure MediaCodec::stop() and MediaCodec::release() still return
am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

* commit '2c157e0f127f36b4c709508f899c2a9f32ba3bd4':
  Make sure MediaCodec::stop() and MediaCodec::release() still return
am 5bb603c1: am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

* commit '5bb603c1e1984dcac0bc7b0e4f82c623710d54a8':
  Make sure MediaCodec::stop() and MediaCodec::release() still return
Merge "Use correct pid when running under test harness" into jb-mr2-dev
Merge "Fix error message to match CTS" into jb-mr2-dev
am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev

* commit 'dbe60357db3be0fd6268ce777647733c3383aa72':
  Use correct pid when running under test harness
am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev

* commit 'dbe60357db3be0fd6268ce777647733c3383aa72':
  Use correct pid when running under test harness
am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev

* commit '1de65a91b9d174b26b594073eb1ee0dcccb31819':
  Fix error message to match CTS