Merge "Revert "Move sepolicy and recovery from on-device tree and add dependency.""