Merge "Switch to SkAndroidCodec::computeSampleSize"