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

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

Change-Id: I89dfe9ae9d55c3402330670e00784c4f97cabef2