dq_type now takes 4 possible values, one of which is
the original multiply-only dequantizer.

Change-Id: I2180f632f0d7f91dc391a6e802a93a77de789228