Merge "fixed proguad library path to 5.2.1" into studio-1.2-dev automerge: cd994cd
automerge: 2d7bc31

* commit '2d7bc315ed1dfa17b69f621387e2761df7eefcfd':
  fixed proguad library path to 5.2.1