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

Change-Id: Ic6105326383abfbef66e03779d011d7b7e655b2e