Merge "Camera: add device 3.6 and buffer management APIs"