Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."" am: be7f81f58d am: 1f711eed17

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

Change-Id: I272fba248b0a023e91347be18230118a08014c27