am 6317f13e: (-s ours) am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev

* commit '6317f13e419f0df239de612d29ffda8209c6d6cd':