Remove unused macros
am: 561d1d71eb

Change-Id: I859b913e79a9d2e6308bd1eecb672b577d2f3dd3