Merge "init: hack for /charger symlink"
am: 94f476b01e

Change-Id: I3348853950ef016bcdb35ac920f357eafca5f47d