Fix generic/x86 and comment out htc devices until caf support strengths on cm

Change-Id: I8deaac9c996a87c0bd42359d44d56664c2cbf1a7