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

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

Change-Id: I39aa18d29f65b15dde9094d11d965b80d402179d