Add Jose's fix to opticharger

will allow for it to work with default /out and user defined /out

PS2:Remove dependency
Change-Id: I3f242bb19f6f067f3e7a2cd7a4d384d9a6f2053e