Merge "shell: allow reading battery info dirs in /sys" am: 71955fc7ad am: cf013954d4
am: 15a7934c49

Change-Id: I0a9d758fa17691cc48ed2b06186e5f7e9cc50158