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

Change-Id: Ia83ac2bda90969378009ce9beda7acc3d576b511