am 3230b2b2: am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating"

* commit '3230b2b2b7225fc44515a1650ad79022b959b08e':
  Grab macros from libbase instead of duplicating