Merge changes I241824bf,I9021864f

* changes:
  Convert ColorLong in native code in Paint
  Restore Paint#nSetColor(@ColorInt)