Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" am: dcb1f24e9b am: 6c1aa4584a
am: 947d60cc7d  -s ours

Change-Id: I7b20d10de530f9a70dffc42ad882c0a5cdd8a511