Merge "Copy preload2.jar to build artifacts" am: 64583c332a
am: dc017c4e49

Change-Id: Ic0d41a8d555b3f0b07a40ecfedd18e3e9341bed8