Merge "Update build tools version for N MR1 samples" into nyc-mr1-dev