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

* commit '3aa7069b60ff41b5047382d64a941a6aff23de58':
  Camera2: Reorganize high-speed recording API slightly