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

* commit '68aca93ca3bd7c13921089014cce04d07240d0e1':
  Export the new system_server classpath.