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

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

Change-Id: Ia81a3ad625e2ec3ff70501b70c3bd36d751e9873