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

Change-Id: I1237efd7c510e29dd35eed88b1f07192c5c91521