Merge "libwriterfuzzerbase : Bug Fix" am: 657dd4cc am: 46221e6c am: cbc4c016 am: e2888662

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



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