Merge "Fix case of libc++. am: 3e94f7e am: cbd6ce1 am: b67649e" into nyc-dev