Merge "Refactor NativeHeapTagging compat feature." am: 077e78a71f

Change-Id: I6e51200ae57c78c45c503d481ef66b14eb8544c3