am 6b6fc7a9: am 09f02ff1: Merge "Drop BOARD_SEPOLICY_UNION."

* commit '6b6fc7a95889f40866df201f78fdcd6b6d80aeb8':
  Drop BOARD_SEPOLICY_UNION.