Merge "Fix RefBase Explicit destruction" am: 90ef8482e3 am: c15cd2e405

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

Change-Id: I33a0188699160dec1a9c51b4b40cfc20b9e98fcd