Merge commit '7135a3ca37970551a85d477650e43717b1094987' into HEAD

Change-Id: Ic70c8ea89ff4399d9c6a386d60f536da457bc5b1
tree: 6c35255dbb5f6eff0fe11cde2cb5772673d314da
  1. bluetooth/
  2. vndk/