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

Change-Id: I0acf5aeda13fae57853b0fac6db935733b62f14e