Merge "Clean up dumpstate HAL 1.1 VTS test." am: 449e8e12c9

Change-Id: I2ecb9ff21fee7fb83418091cdf6aec633e0c8c7c