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

* commit 'c3ba3245a0bb66179fa05aa357382a1886ce387a':
  Export the new system_server classpath.