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

Change-Id: I1968d2763896fbd62127e0cc5b02b5ca2c1998c0