Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt"