Merge changes I87b5b309,Id23d941c into studio-1.1-dev
automerge: 92eb4b1

* commit '92eb4b169c383a60d87215d9dd83ff9a07a13961':
  Update adt plugin's manifest to use lombok 0.2.3
  Remove obsolete p2gen folder