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

* commit '4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
  Drop BOARD_SEPOLICY_UNION.