Remove obsolete macros/enums from the code. Change-Id: I398f4d65bcfc996bbaf12076b55b7e6cf9e182be CRs-Fixed: 2414803