Merge "Update the context classpath after the dex files are opened."
am: 528c3ed79d

Change-Id: Id9ee1ac96ecaaf9871f0b8c251a38ea7c57f4352