Remove obsolete/unused macros. Change-Id: I7a812c9b6ce4f2af151dd7262cb6d93dec6d0c2a CRs-Fixed: 2475125