am c73b8a80: am 4887ee3b: am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."

* commit 'c73b8a80d421356b1389c1e45deba641ae12c423':
  Don't define S_IRGRP in AndroidConfig.h.