Unify composited layer/base layer draw path

Multiple paths were redundant, as they both synchronized the layers, and drew
the base if needed.

Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/179965/

Change-Id: I1c355510f6edda4631190f2d26df8171e795a6ac