Merge "Update build tools version for N MR1 samples" into nyc-mr1-dev
am: 3d3b374219

Change-Id: I0a50f15803b7731d903fb5648524a819d2b63c7d