Merge "Add support for max_comp_streams option for zram" am: a9ea1e4d99
am: 3c4dfb6fc4

Change-Id: Icd88ade981256ce396477d519934025c9410c92c