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

Change-Id: Ia3705291cce824f0b4f138eeb9e00ed888943fe4