am eac548c6: am 61d6a008: Merge "hwc test: 64-bit compilation error"

* commit 'eac548c65c30b04983a8c904f9a1c6003d428196':
  hwc test: 64-bit compilation error