Revert "Grab macros from libbase instead of duplicating"

This reverts commit 2535cae005512494469fc5cea1fe630288ecb083.

Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
3 files changed