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

Change-Id: I0c3c488fe8814dede3a601aefecc8d595619dc39