Merge remote-tracking branch 'remotes/goog/studio-feature-ij2016.3b' into studio-master-dev am: 8ff7068455 am: 4f69d4d8e3 am: c47d631a17
am: cc4e2666e5

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