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

Change-Id: Ic064ec531e967bf22851dfd663d11733fe3d68c4