Merge "Update build tools D8 to version 1.5.13-q1" into qt-dev
am: 7f20188e87

Change-Id: I86d09216f51704baeea822ad86ef9c18e5eadf2c