Merge "Remove obsolete note about libatomic. am: 59daf35 am: 7fd9ff6 am: 72ef5fc" into nyc-dev