Fix build warning duplicate file copy, file is copied in build of livepicker,
no need for it here
kernel: merge linux 3.0.61, merge googlecommon 3.0