John Reck 9a7c192ebe Remove two macros
This is colliding with ag/13519705 and causing
build issues. So replace the macros with constexpr's which are
better

Bug: 179047472
Test: make
Change-Id: Icf7c38077ef608ec97e737d47d3d6c25246190bf
2021-02-08 19:32:21 -05:00
..
2021-02-08 19:32:21 -05:00
2021-02-08 19:32:21 -05:00
2021-01-29 11:46:48 -05:00