Remove our wait4 hack.

Change-Id: I700dbe6e177eecd1457363330b9b9804e2e9a668
Merge "Remove our wait4 hack."
Remove another external/strace build hack.

Change-Id: Iea273b5f22920607d01ed191ced00ace30fc11ea
Merge "Remove another external/strace build hack."
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1