am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."

* commit '2d47488e675d0eb839ae6a7f9544cc64c50c68d2':
  Drop BOARD_SEPOLICY_UNION.