Merge "Camera: fix NPE in buffer error callback" into qt-qpr1-dev
am: d0a1ab93d4

Change-Id: I6b2835b1073df0aeb69e28a1c3aa571caa32b149