Merge \\"Revert \\"ART: Disable check under memory tools\\"\\" am: a1f2201647
am: 1963e219b8

Change-Id: I3dc25307635e89475fa1aa38521cdc161f4d92cc