Merge changes from topic "remove_ashmemd" am: f0d17fb50e am: f42bc422cb
am: cfc98e20c0

Change-Id: I92248b4c9a0d5ca6db1e894e61372630e4d8a4da