manual merge with latest Makefile
manual merge with latest Makefile

IntelRealSense/librealsense,IntelRealSense/librealsense,IntelRealSense/librealsense,IntelRealSense/librealsense,IntelRealSense/librealsense,IntelRealSense/librealsense,floe/librealsense,floe/librealsense,IntelRealSense/librealsense,IntelRealSense/librealsense,floe/librealsense,IntelRealSense/librealsense