Merge "Remove Android-added linux-sh support (not upstream)."