Merge cherrypicks of [2364774] into nyc-mr1-security-a-release

Change-Id: Id15a168b215b86832b8f75f470ff79267dd2b612
tree: 654584b24770199fbb03af9e1d2ec1c8aa9e76d4
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk