Merge "Fix build error of generating fec data" am: 1efeb1d970
am: 918742ac86

Change-Id: Id85c5ed4936d1ed7f8463b483e9e942e8ef72e6f