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

Change-Id: I754b5d0d1e9426efa07821eba8a6ca6c826914cf