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

* commit 'b0f423d161389e49ea343d6fc916cccdbda1551d':
  Camera: improve Image allocation in camera CTS