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

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