am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API...
am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '3aa7069b':
Camera2: Reorganize high-speed recording API slightly