Merge "Export the new system_server classpath." into lmp-dev