am 9160c60f: am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."

* commit '9160c60f136bafc9b8c07252e5814950eff33a20':
  Drop BOARD_SEPOLICY_UNION.