Merge the 2021-08-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  verify embedded buffer matches address in parent

Change-Id: I6e48dfc5347ac40475dbb4421cad52d6640afe5e