Merge "Remove ashmem from system/extras"