Merge "Camera: support libhardware camera device 3.6"