Merge pull request #1854 from pherl/javalite

Cherry pick protoc-artifacts change into the javalite branch