Merge "Camera: improve Image allocation in camera CTS" into marshmallow-cts-dev