Merge "libstagefright_writer_fuzzer : Bug Fix" am: ec578c8b46 am: d4ddd4b6d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1991758

Change-Id: I7f7a89617eb27d45fd3611b240e9bceacf47deeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>