Merge "Updates CVE-2019-9313 to use libstagefright_mp3dec_headers" am: dc6d832bf4 am: a72611070d am: 8068d57bd1

Original change: https://android-review.googlesource.com/c/platform/cts/+/1525001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17c3468e576564dad6ce24308078ec93c334f653