Revert of ensure that we call onUnlock only when we onLock succeeded

Revert of https://codereview.chromium.org/112783004/
Reason for revert: Failing assert on Android

TBR=scroggo@google.com,halcanary@google.com,reed@google.com
NOTREECHECKS=true
NOTRY=true

Committed: http://code.google.com/p/skia/source/detail?r=12646

[robertphillips, 2013-12-12 18:06:29]

Created Revert of ensure that we call onUnlock only when we onLock succeeded

[commit-bot: I haz the power, 2013-12-12 18:06:41]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/robertphillips@google.com/93673005/1

[commit-bot: I haz the power, 2013-12-12 18:06:45]

Presubmit check for 93673005-1 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com')

[reed1, 2013-12-12 18:07:39]

lgtm

[commit-bot: I haz the power, 2013-12-12 18:08:01]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/robertphillips@google.com/93673005/1

[commit-bot: I haz the power, 2013-12-12 18:08:11]

Change committed as 12646