Revert "BoardConfigCommon: Prepare for CAF"

This reverts commit 10aeea2d1113506dc861800d2d46ad1b068f5aab.
camera: Hot-fix some fcs