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

* dev/11/fp3/security-aosp-rvc-release:
  Fix a bug when getting a gzip header extra field with inflate().

Change-Id: I236860f63d14c350b92b9aca646782880f9ef6a7