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

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

Change-Id: I5065b0f0a5158d1f27770133c4741b239fe088c9