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

* commit '6b747f9d55d146b37ef4f2de461a4ffc576230a5':
  Grab macros from libbase instead of duplicating