Merge "camera2 vndk: Improve error handling"