am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration. am: 128a2fa002
am: cbd35d6f54

* commit 'cbd35d6f543d2b1b94e933cd0018d72d400a447d':