Merge "Revert "dumpstate: Add security log dump""