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

Change-Id: Idaff58724265933eac067c6e9b45fc0152bc65be