camera: Allow hardware/camera.h header to be overridden

Change-Id: I715ba261de0b01e61cbfe7cacd567a9f511fb8cb
rm leftover merge pieces

Change-Id: I9c017d9b90c8cab3b53fcfbc343d1e83f35167d3
Signed-off-by: cj360 <ayunker551@gmail.com>

& add missing mDirectDevice

Change-Id: Iec131ea73fe22881ddafbecad3b88bc12e201565
Signed-off-by: cj360 <ayunker551@gmail.com>
Merge branch 'cm-12.0' of https://github.com/cj360/android_frameworks_av into cm-12.0

Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	services/audioflinger/AudioFlinger.h

Change-Id: I8823ce9bace24dc29f183098c0a3d64f4c58687b
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-12.0