Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4' * commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4': Fix hosttests to use the new ddmlib API.
Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4' * commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4': Fix hosttests to use the new ddmlib API.