Merge "Remove ashmem from development repository"
am: 9198f40364

Change-Id: I4561396947f4aa829a30c7c0db116aa9e060127e