Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt" am: ada0854169
am: 9080b10f3a

Change-Id: Ie735c40b3e3240389ff8ce38dc9692452594f4ae