am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '8cc42f326a3946f21bfceef5999146ea2266de3f':main
commit
be181a227c
* commit '8cc42f326a3946f21bfceef5999146ea2266de3f':main