Merge "No more ashmem equivalent checker false alarm"