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

* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
  hwc test: 64-bit compilation error