Merge "Merge "Disable some heap verification test cases for memory tool" am: 11ce48e8 am: c5d970c4 am: 7a1a834f" into oc-dev-plus-aosp am: 24aa8f72 Change-Id: I83379e76466eb5cc92f6c98ccd11f819cbdf563d