Merge "Clamp NNAPI HAL Version to runtime version -- hal"