resolve merge conflicts of 14231e3c57 to master.

Change-Id: I5333f649b7d3f3142846c33be55d6e4735a090d1
tree: 028f50881aea989606fa81f515fa28e8c6d5035e
  1. libbt-vendor/
  2. msm8909/
  3. msm8960/
  4. msm8992/
  5. Android.mk