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