am b039a1b6: Merge "Update ddms/hv prebuilts"

* commit 'b039a1b6dc2e606d02d7342f4f5e937f4bd5196d':
  Update ddms/hv prebuilts