Merge "Allowing system_server to search sysfs_power dir"