Merge "Remove ashmem from system/extras" am: 887e7e9641
am: 255d482750

Change-Id: Ibaa2ef80ea4b9345d4e737caf635a81e87efdc96