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