Merge "libwriterfuzzerbase : Bug Fix" am: 657dd4cc6c am: 46221e6c64

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

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