Merge "Fix and reenable fuzzer." am: 5c3748e776 am: e58c2c57e8 am: 84df8ffa83

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

Change-Id: I2589dd5a882879707e05e402f2216a3a4ba23a75