Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev