Merge "Use the more pervasive /bin/sh instead." into dalvik-dev