Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev