d2: remove Operators, its a standard class now

Change-Id: Ic6dae6810a9265a9ec139957302d297fb710ae08
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0