Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL.""