clean up FORCE_SILICON handling

Change-Id: I5cc786a8ff5a4364f4458a9919b9863bae57fd55