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

Change-Id: I6a1b99c150e8c601666ef6132eade20ceeb599af