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

* commit 'f6efe701f17e9cb7b03e197fea6125617859e497':
  Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9

Change-Id: I2ef5c46647bd2c96e8bba7dc99b57311e9a79d70