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

Change-Id: I442019c4eac6be8365841a0d09dd42f968e024e2