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

* dev/11/fp3/security-aosp-rvc-release:
  Fix overeager DTD destruction (fixes #649)

Change-Id: I208e4c75ede18dd0dd8a506d3332f1e4e4a3a822