Android CTS 4.4 release 4
Merge "Remove another external/strace build hack."