Update makefiles for adapters. am: 32ba4deeda am: 46042784aa
am: 4ed381e09e

Change-Id: I8b7ba3843659813d4ae1fe2f713436b417775032