Merge branch 'jb43-cm' into HEAD

This is a CM merge....
This was a pure AOSP merge:  f2ba961bb81d6ffb9151f462c1b1c1d46da73749

fixed extra #endif in src/core/SkBitmapProcState_shaderproc.h
  "     "     "    "  src/core/SkBlitter_ARGB32.cpp

Change-Id: Ib366ac6a9b9523f8fc74f2d1112b6fc07fa0f393
Rebase some skia

Change-Id: I769602bd749ee31d5fcb6168369ca434a98cbd27