Merge "Add 64bit support to CTS Tradefed" into lmp-dev