am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."

* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build