Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24
am: dbb2211d32

Change-Id: Ic769abab991e29f723c6b80f28c3388595aa7e00