Merge "healthd_common.cpp: use epoll_create1" am: 1eebae4517
am: 8343cb0722

Change-Id: I2e5c4ec37f89fbcf309c049c09dbe8e16098f8d2