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

Change-Id: Ia69d6c902c9c5ee4a5e79a28094d89daa5e747d8