California cities drop thousands of marijuana convictions