Merge changes Iafa1fe3d,I32dba6b3

* changes:
  Mark convert_(long/double) as API 21
  Fix performance regression in color matrix.