Merge "Make project build in open source" into studio-master-dev