Merge spl-2020-12-05

Change-Id: I62a820ff853882ed23a4f1e39122c7619ae160b3
tree: 3cb596aab5354b44a3431981b70ef3be22d2e5bf
  1. darwin-x86/
  2. linux-x86/
  3. manifest.xml