Merge "Camera: add HAL1 recording batching support" into oc-dev
am: f23752f82e

Change-Id: Ia71b3bae7c9273b4b66288e70da551f6ef50e887