Merge "/system/bin/sh _is_ the shell now, and ash is gone."