Merge "Revert "Move sepolicy and recovery from on-device tree and add dependency."" am: c81c44a8 am: 33b3a1ea am: 0ef4fa20 am: 84ba4355 Change-Id: I8d92f9507a7bdd890a3b062f065758e28ddcaa3f