integrity: check_and_repair function, simplify hc-policycheck

Change-Id: Ic544e608df655fdf78f1e9ffd80214da75107c04