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