Merge "Camera2: replace AssertionError with error log"