Merge changes from topic "libneuralnetworks_common-cleanup" am: ee7a476090 am: f3ac53fa2a am: 14c577fc22

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

Change-Id: I3c91d889cb924b1363b9ecca864604b22e6bd135