Merge "Added IncrementalFileMerger; update MergeJavaRes" into studio-master-dev
am: 017bc62266

Change-Id: I525808d1ef57c1e5bf735b61bf02f47551e833e5
tree: 5cc23fe61a890fc4234df38926db10f3ded9bf67
  1. src/
  2. apkzlib.iml
  3. BUILD
  4. build.gradle