Merge "libdm: remove libbase dependency in header." am: 56d079b40a
am: 287c862d16

Change-Id: I5f939e21c1a023e271852af1c0f62c64215579ab