Merge "Add arg for overwriting class loader class path"
am: da5cbc32b8

Change-Id: I40bd8c2a7fccb10f217f0eb3e491d7ab6b5ef644