Merge "Fix Eclipse build." into studio-1.1-dev