Merge "Revert "Copy sdk-classes.jar to classes-header.jar for turbine."" am: 73140948c7
am: a99dd1a916

Change-Id: I535833a131eda8d92077f6b9883017dce101c227