Merge "Turn on power accounting in AOSP" into oc-dev