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