am 4a3a45cd: am c44ca2ba: am f9e06fd6: am eccd780e: am 682edd51: am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '4a3a45cd23ad6a0b28371828250dfe4bdc890608':main
commit
f6b7695f39