Merge "Android doesn\'t really have <sys/syslimits.h>."
am: 282db28ba0

* commit '282db28ba048ccaf956b208ab6059ff288c3d74b':
  Android doesn't really have <sys/syslimits.h>.

Change-Id: I531895563641c54984a72b08d49bf389bc445798