Merge "Add libdm_test to presubmit" am: be074feb93 am: 5ef6de1910

Change-Id: I27133c12898bcbe0b9a6041b83640e5a14ca3334