Merge "Camera: Free buffers more aggressively" into oc-dev am: 5d6ebe5341
am: 4910fe04f7

Change-Id: I0a8a611f2ec41909a4703066826340e477e40b88