Merge "dumpstate: switch to HAL static libraries" into klp-dev