Merge "Fix and reenable fuzzer." am: 5c3748e776

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1349125

Change-Id: I45639eee5783a92c9a6dcf942c72afeb309dd1bc