Merge "Update strace update docs, fix strace -V."
am: 6ae3ff4383

Change-Id: I85fc966c578910f7c9128f0256a6a990dbc3b491