am 0a0bb953: (-s ours) am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.

Merge commit '0a0bb953f0198e738e3e15a869af21a66a442466'

* commit '0a0bb953f0198e738e3e15a869af21a66a442466':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.