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

* commit '9dbe6b1f61c9ff4b099ba7b008cf2ad9389ed80b':
  Camera2: Reorganize high-speed recording API slightly