Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  SimpleDecodingSource:Prevent OOB write in heap mem
  Fix heap-buffer-overflow in MPEG4Extractor

Change-Id: Id610a2db4fb24b4eeecd2869307f81117c0699ce