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

Change-Id: Ife1b6aa7c68d97fe1ba0a0b121852d2d2cbb1a80