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