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

* commit 'ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
  Grab macros from libbase instead of duplicating