Merge "camera2 ndk: Fix error code passed on ACameraDevice_ErrorStateCallback."
am: 31215a03a3

Change-Id: Ie3b619dfd1d1a1a15adf918a79add60bd439bd8c