Merge changes from topic 'api1_zsl_rework'

* changes:
  Camera2: Add native test for framework-backed ZSL
  Camera: Rework ZSL path when using API1 with HAL3