Build CarbonFibers into Settings package itself (2/3)

Follow diff style guidelines

Change-Id: Id3a5ba0fb9da33e52cfe9397c91a8773ca9ec399
Signed-off-by: Daniel MM <daxx4182@gmail.com>