Remove legacy cfg items definitions and related macros for the converged CFG items. Change-Id: I12944f50d68dafe989417dda777f29a6233c97a4 CRs-Fixed: 2340856