Merge changes from topic "remove_ashmemd"
am: f0d17fb50e

Change-Id: Ia61e014f702fbbee0f53a043055393f983cb6069