Restore required makefiles, based on coral commit.
This partially reverts commit 971eaca91c.
Change-Id: I4f4e3fe33649acc769658ca63db652cf0c1b2c61
Restore required makefiles, based on coral commit.
This partially reverts commit 971eaca91c.
Change-Id: I4f4e3fe33649acc769658ca63db652cf0c1b2c61