Merge "Add BuildCompat#isAtLeastNMR1()" into nyc-mr1-dev