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

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