Merge "Make ZFileOptions setters return "this" for easier chaining." into studio-master-dev am: fe8a72b490 am: b42956b7 am: 685081fc am: 88c09956 Change-Id: I920753c4b1b274c22e4f364e2244087c42f27bbe