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

Change-Id: I68d25262409cc64c05385fe6f60118652edf3cee