Merge "adb should #include <sys/sysmacros.h>"