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

Change-Id: I3796b0484b51a25f72c16bd395c346c3db4c0305