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

Change-Id: Ia4dad911062490db360fec8a1dc470b5a7bce9d6