Merge changes from topic "libneuralnetworks_common-cleanup" am: ee7a476090

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1878019

Change-Id: I3da9b3f8315c50379b4f95f060d15f6a8ae3274c