Merge "Camera2: restore the ImageReaderTest format check" into klp-dev