Clean up setLayerType and setLayerPaint

bug:21755299
Change-Id: I8f0953ccfc3d743abdecc8ec228ed3e1b6718c3c
4 files changed