Merge "Don't define S_IRGRP in AndroidConfig.h."