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

* dev/11/fp3/security-aosp-rvc-release:
  Canonicalise path before extracting relative path

Change-Id: Ic9b9583758d6d0b37eb7779dbc31bce37a1cb0ba