National Guard, Marines to remain in Los Angeles