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

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

Change-Id: I8f90500a2b01235ca1b9d9e6013f4b41205e62f3