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

Change-Id: Ie48fb0133fbb82892d0346f5b2fd712bb76bc906