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

Change-Id: I81e2343cbbf73eee03d0feb1d9b9b134edda7492