start again on Sk4x with portable version and unit tests
work on tests

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot,Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot,Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
BUG=skia:

Review URL: https://codereview.chromium.org/704923003
Avoid warning in nanobench related to loop count with nvprmsaa4

The tests path_hairline_{small,big}_AA_conic were calling the test
function with NVPR. This caused a warning in nanobench.

The here removed hunk comes from commit referring to skia:2042 ("Enable
NVPR by default"). This is a workaround for a bug. The bug is fixed by
the commit referring to skia:2078 ("Logan bot fails NVPR assertion in
bench").

The proper fix is indeed make sure that path renderer chain ends up
trying software path renderer, if the path contains conics and is a
hairline.

The removed hunk refers also to skia:2033 ("Figure out what is happening
with conic path segments in NVPR"). The above solution is correct also in case
NVPR would support conics, as NVPR would not still support hairlines.

BUG=skia:2078

Review URL: https://codereview.chromium.org/685213005
Move from libstlport to libc++ for Android framework builds

Review URL: https://codereview.chromium.org/714113002
Reenable deprecation warnings on Android framework.

Most recently introduced here: https://codereview.chromium.org/304333002

It appears these are not currently needed (I just disabled it and
successfully built).

Since we appear to be out of the transitional period, I propose we
remove them so we can know if we deprecate something Android uses
(and fix the call site).

Review URL: https://codereview.chromium.org/696063006
Remove all knowledge of resource keys from the legacy cache.

BUG=skia:2889

Review URL: https://codereview.chromium.org/705413002
guard call to CGColorSpaceCopyICCProfile in case we're building for iOS

BUG=skia:

Review URL: https://codereview.chromium.org/712363003
Remove cached OptDrawState from GrDrawState.

Since we now snap and create the ODS one time in the inorder draw buffer,
there is no need for us to keep a cached version of it around.

BUG=skia:

Review URL: https://codereview.chromium.org/701123003
rebase from early clip

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/707413003
update dox

BUG=skia:
TBR=djsollen@google.com

Review URL: https://codereview.chromium.org/697363004
Rebaseline multipicturedraw GMs

This CL rebaselines the multipicturedraw GMs as a follow up to:

Always enable layer hoisting in Skia (https://codereview.chromium.org/698493002/)

TBR=jcgregorio@google.com

Review URL: https://codereview.chromium.org/714153002