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

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

Change-Id: I8069d1136b48b2d36871745a4cd564e60221c411