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

Change-Id: I54f1b7faebb917c0dfdc0a22d9a1dbe97958260e