Merge "Re-enable jarjar for release builds." into studio-master-dev