Merge "Add d8 to build tools" am: 5e56071da1
am: a473af1733

Change-Id: I7d6fd32bb17c27247356ebc517db3142b9b7c650