Merge "Move sepolicy and recovery from on-device tree and add dependency." am: 2d4d8842 am: d6aae57b am: bdfd4583 Change-Id: I4f2109c1541bec28ce79f03dbe41901a930372e6