am b3a45fea: (-s ours) am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.

* commit 'b3a45feaf9f09dd60b94ef88bbc52ff7a75f39d2':
  CTS vm-tests now depend on hosttestlib.