Merge cherrypicks of [2364903] into nyc-mr1-security-e-release

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