Merge "No more ashmem equivalent checker false alarm" into oc-dev am: d6d91e5833 am: 9d4f73e753
am: de60796189

Change-Id: I1f36724ac55ca3abe39b7a226fc2b825d291ba72