Merge "stagefright: put battery update under a separate lock" into oc-dev
am: a387a6cc1e

Change-Id: I127eaa93bd4fb9b1849b548c5c246035cb59b8c9