Merge "libcutils: route to ashmemd" am: 5bccd33e0b am: 6604befa2e
am: f60debf334

Change-Id: Ie996609636608039875277e4c8051b30f7715013