Merge "Revert "Allow sphal to load some LLNDK for legacy devices.""