Merge changes from topic 'am-4d21b9824d8247648c328224f533af1e' into oc-dr1-dev-plus-aosp

* changes:
  Merge "bug fix: fix encoder input port configuration issues" into oc-dev am: 7d1592a732 am: 0eb102a18b
  Merge "bug fix: configure input port format before setInputSurface" into oc-dev am: bd5b6f8535 am: 4dc4fa7340
  choose input color format between 420p, 420sp am: 1d273b3bcf am: 0113be3ac3