Merge "Allowing system_server to search sysfs_power dir" am: 35f2cf80 am: a6734fac am: 7d6a23ad am: 2d443730 Change-Id: I24ff25f7126ee237fdeacbf1ba509217cbc8e297