Merge changes from topics "dsu_ashmem", "dsu_clean_up"
am: 417aed2c61

Change-Id: I3382c8a7aca1fadb9e7ef37d050b52e1fff69155