DO NOT MERGE: CameraService: Fix permissions check issues

Bug: 15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
camera: allow device to append camera parameters

Overload using include/camera/CameraParametersExtra.h in device
tree to add device specific camera parameters.

Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h

Change-Id: I9f31ef0e1d616ed303be1052c1ca449cfec5d4eb
Merge branch 'kk44' of https://github.com/VanirAOSP/frameworks_av into vanir