Merge "base_system.mk: Support system_server jars from apexes"