am 50ec9267: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '50ec926744db8941d0c8f0d017d169d20c1ca3f4':
  JOO47B
  JOO47
  JOO46C
  JOO46B
  build: register BOARD_HAVE_BLUETOOTH_QCOM