Merge "Drop BOARD_SEPOLICY_UNION."