Merge "shell: allow reading battery info dirs in /sys"