am 8d991c50: Merge "Camera: improve Image allocation in camera CTS" into marshmallow-cts-dev am: b0f423d161

* commit '8d991c50f104abc11dc5ea93c23cd8aa1a05c9a0':
  Camera: improve Image allocation in camera CTS