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

Change-Id: Icdeb3ce47770050c9cd455143048669574718d33