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

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

Change-Id: Id65fe7775234d23faa1d4f1ff58283a77325e6f7