Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 258fd3b730

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