Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix OOB write in BuildHuffmanTable.

Change-Id: I37128457341824dfe94497494bf62fb517f0f029