Merge "Restore P BOARD_PLAT_*_SEPOLICY_DIR behavior"