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

Change-Id: I78c545cc1236d0392c67223a379386a07a0fd6d2