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

Change-Id: I5cb3a43c09546881872803dabefb23950c0c1c17