Merge commit '14db637' from origin/upstream/master

Change-Id: Icd396e16b58fe3c43e69184daace8e4b700ac57a
tree: f89681e9d0d3d75f060dc194f9d4ed8bf94de445
  1. .gitignore
  2. BUILD.gn
  3. asio/