Merge "Make the /system/bin/sh link so installer.c works."