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

Change-Id: I3ce2734b4c1cb1339b401b471c62b5297037e968