Merge "Update fence event path for kernel 4.10+" am: f3e024a065
am: 480610413d

Change-Id: If72059250746f9c642d9b0174d9cb15b7dcdaf94