Merge "Remove system_server classes from the boot image." into lmp-dev