DO NOT MERGE: fec: remove unneeded target executable am: 955d3afe95
am: 4f492d7c7d  -s ours

Change-Id: I8851cd9409a13ddfac8c0b70cab2f7edf6ccc10c