Merge "libcameraservice: fix static analyzer complaints"
am: 836a3100bd

Change-Id: Ia58b6c67c50ab2ddf127f612048e5e3fd999fb3a