Merge "Use Lombok 0.2.3 for ADT plugin" into studio-1.1-dev