[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: be811e0b2d
am: b0a55cf0ce -s ours
am skip reason: subject contains skip directive

Change-Id: Icb63984fabb133e1222439694d16aeeafb9d254d
tree: e83a6bbe988bc6f6d6c0ca1003d760505670084b
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk