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

Change-Id: I84197c2f1c471f31afb682126d82b81f0a05e1b9