Merge "Remove obsolete cruft from the strace Android.mk."