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

Change-Id: I2d85c4b59ca919cf8661f774ea617e6562d88ba2