Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

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