Need to remove these files for cherry pick to work

Change-Id: I212b44f3d269904aac838c367e56ada45957fba4
Signed-off-by: Luis Gomez <ecelgp@gmail.com>