Merge "Replace -classpath with --class-loader-context for preopt"
am: 1a7b46bf71

Change-Id: I978c17cb5ca92ad21a30d983ef42241dbff58944