Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Fix UAF in ~CallbackEnv

Change-Id: Ib4a1581c0d177d15bfcb8d72bbb7cf66f1ce4dc6