Merge remote-tracking branch 'goog/studio-master-dev' into merge

Change-Id: I3a6cdf7ed80e765f950f7f77935e0978372fc625
tree: d10b4d457db83c27b32194cd0eff2eb59719ba4f
  1. src/
  2. apkzlib.iml
  3. BUILD
  4. build.gradle