Two controversial laws which allowed indefinite detention without trial will be abolished, prime minister says.