Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"