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

Change-Id: I54c1f3020ba0c92a334966fcf52ccd92c395c329