Merge "Restore P BOARD_PLAT_*_SEPOLICY_DIR behavior"
am: f15746f284

Change-Id: I5ba585f656e4fec21143c6dc9ecce71fe6b01881