Merge "Remove references to /sys/android_power/*"