am 1ef5d7be: (-s ours) DO NOT MERGE. Remove obsolete TradeFed files from this branch.