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

Change-Id: Id6978fa2ebbfa0f39c41adaaa82f65e02ec9f1e0