Merge "Remove references to /sys/android_power/*" am: 88f50f536f
am: 4c66038ecb

Change-Id: Id5e44f168a2b829a28345472c1b2f55aa4c7cef1