Merge "Explicitly depend on sepolicy artifacts in recovery targets" am: cc6e84223b
am: 05796fe8b3

Change-Id: Ic64fea6fe5c50c6b645544f5ebd903e287f7033d