Merge "Resolved UAF issue in RefBase fuzzer" am: 9a79c84499 am: da2960df35

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1424812

Change-Id: I64785b4b385d9b65a71d6b8cbf316b4b89df6a58