Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04
Clean up references to AUDIO_FORMAT_PCM_8_24_BIT

Change-Id: I08771eb2664b7082561a40937218c7f4414e2cce
Fix type error in AudioTrack::processAudioBuffer

It returned a bool instead of nsecs_t

Change-Id: If0c096dac411afc0a4142ec1e59c1fdd36d4867c
Add comments

Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
Fix indentation

Change-Id: Ia28720a7d0fad8cf110c2448b967d5648d42e017
am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during still capture

* commit 'adaa78c901a2f2509965b7acc1cde848dfc6bafe':
  camera2/3: set preview callback oneshot flag during still capture
Merge "Pass additional arg to acquireBuffer calls."
am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':
am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '1bb59258458350af518170558120783bc2f9e61d':
Fix AudioTrack::flush()

It was only flushing at a surface level, and even then only the first time
the server observed the client's flush request.  Now it flushes at a
deeper level, but there may be even deeper device-specific flushing.

Bug: 9770947
Change-Id: I687cc3410ff9e5e5d4a5dcb9e3b129501e53d247
Merge "Fix AudioTrack::flush()"
Merge "AudioTrackShared cleanup"
always pass the BufferQueue explicitely to consumers

Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
camera2: Implement ICameraDeviceUser::getCameraInfo

Bug: 9529161
Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
Merge "always pass the BufferQueue explicitely to consumers"
update to new Consumer APIs

Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
Merge "Fix typo in logs"
Merge "Add comments"
Merge "Fix indentation"
Output more detailed error message if loading library fails

Bug: 9805979

Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658