am 3d02b48b: merge from open-source master

Merge commit '3d02b48bd95293c767563729264f007dbcff82b3'

* commit '3d02b48bd95293c767563729264f007dbcff82b3':
  Fix the layoutlib Paint.set(Paint) method.