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

Change-Id: Ibd04663fc3f409537c0dbc59e7ec94472483fea3