Merge "Prepare for memory tagging support." am: b8d62ff028 am: 9baac65f45

Change-Id: Id91d9bf531e2ef4f565612bf146789c50f215423