Merge "Use += for BOARD_SEPOLICY_*"