Fix includes so that they no longer rely on the global Skia includes directories.

bug:13225538
Change-Id: I3e424513a4d8a9cb648ba3ac13efac304590f826
am 504ee5cc: Merge "external/neven shouldn\'t depend on android_runtime."

* commit '504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c':
  external/neven shouldn't depend on android_runtime.
am 00372146: Merge "Remove unused parameter"

* commit '0037214648ffc810cd54c232b2026096e834a93a':
  Remove unused parameter