Merge "No more ashmem equivalent checker false alarm" into oc-dev