Merge "/charger->/system/bin/charger" am: bd1e386b69 am: d439ae48e8 am: 0116446151
am: 15d810213d

Change-Id: Iad3d56be453154c15f4a9e068986c016f1288b20