Merge cherrypicks of [2402082, 2402023] into nyc-mr2-security-b-release

Change-Id: I3a9c11b75bbd50f5e89e4333bb9058662fb5ac02
tree: 6ea1fa6a0a33091d2056c90a02b128a3a0a2fae6
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk