Merge "Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 am: f6efe701f1" into nyc-mr1-dev-plus-aosp