Merge "libdm: Move includes to a libdm folder." am: bdc56b046e
am: 540ad62834

Change-Id: I71514b29f8552e2ecc8d3f9b7fa1c9b88cccd899