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

Change-Id: Idbc366f08673f92d9e4a5955d870960f2e30eb3a