Merge \"Add BuildCompat#isAtLeastNMR1()\" into nyc-mr1-dev
am: d968a7ff81

Change-Id: I46f20cd5bb19eaeeba3f50ccc8a515c88465028a