Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727ff28e
am: cc421ba741

Change-Id: Ieec33547b5ab7e8f5ac01d72a80477516bcce7d3