Merge "Copy sdk-classes.jar to classes-header.jar for turbine." am: 4737f82861
am: 3bdf246854

Change-Id: Iedf5122b12ae8d79b5a5b420e4a3bc9333bfb2ff